From 2de06993d56107fa6ebcee764929c20dc4d44cc6 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 29 Aug 2014 16:52:21 +0200 Subject: [PATCH] Adwaita: titlebutton are flat image-buttons Hence treat them like those, a bunch of special case styling removed, which also doesn't override selection mode buttons styling. --- gtk/resources/theme/Adwaita/_common.scss | 17 +- .../theme/Adwaita/gtk-contained-dark.css | 370 +++++++++++++----- gtk/resources/theme/Adwaita/gtk-contained.css | 370 +++++++++++++----- 3 files changed, 535 insertions(+), 222 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index f24c77c5b4..267954032d 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -981,7 +981,7 @@ GtkComboBox { } &.selection-mode { color: $selected_fg_color; - text-shadow: 0 1px transparentize(black, 0.5); + text-shadow: 0 -1px transparentize(black, 0.5); border-color: $selected_borders_color; background-image: linear-gradient(to bottom, lighten($selected_bg_color,5%), @@ -2676,18 +2676,7 @@ GtkVolumeButton.button { padding: 8px; } // Window Close button .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 8px; - border-color: transparent; - background-image: none; - transition-property: border, box-shadow, color; - box-shadow: inset 0 1px transparentize(white,1), - 0 1px transparentize($borders_edge,1); - &:hover { @include button(normal); } - &:active { @include button(active); } - &:backdrop { - @include button(backdrop); - border-color: transparent; - transition-property: border, box-shadow, color; - } + @extend .button.flat; + @extend .image-button; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 19e1ea3457..9c630d1d70 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -277,7 +277,9 @@ GtkTextView { text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } - .button:hover, .button.flat:hover { + .button:hover, .button.flat:hover, .header-bar .button.titlebutton:hover, + .titlebar .button.titlebutton:hover, + GtkCalendar.header .button.titlebutton:hover { color: #eeeeec; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f); @@ -285,7 +287,11 @@ GtkTextView { icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); -gtk-image-effect: highlight; } - .button:active, .button.flat:active, .button:checked, .button.flat:checked { + .button:active, .button.flat:active, .header-bar .button.titlebutton:active, + .titlebar .button.titlebutton:active, + GtkCalendar.header .button.titlebutton:active, .button:checked, .button.flat:checked, .header-bar .button.titlebutton:checked, + .titlebar .button.titlebutton:checked, + GtkCalendar.header .button.titlebutton:checked { color: #eeeeec; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #232727, #2d3232); @@ -331,14 +337,22 @@ GtkTextView { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } .button:insensitive > GtkLabel { color: inherit; } - .button:insensitive:active, .button:insensitive.flat:active, .button:insensitive:checked, .button:insensitive.flat:checked { + .button:insensitive:active, .button:insensitive.flat:active, .header-bar .button.titlebutton:insensitive:active, + .titlebar .button.titlebutton:insensitive:active, + GtkCalendar.header .button.titlebutton:insensitive:active, .button:insensitive:checked, .button:insensitive.flat:checked, .header-bar .button.titlebutton:insensitive:checked, + .titlebar .button.titlebutton:insensitive:checked, + GtkCalendar.header .button.titlebutton:insensitive:checked { color: #939695; border-color: #1c1f1f; color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .button:insensitive:active > GtkLabel, .button:insensitive.flat:active > GtkLabel, .button:insensitive:checked > GtkLabel, .button:insensitive.flat:checked > GtkLabel { + .button:insensitive:active > GtkLabel, .button:insensitive.flat:active > GtkLabel, .header-bar .button.titlebutton:insensitive:active > GtkLabel, + .titlebar .button.titlebutton:insensitive:active > GtkLabel, + GtkCalendar.header .button.titlebutton:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel, .button:insensitive.flat:checked > GtkLabel, .header-bar .button.titlebutton:insensitive:checked > GtkLabel, + .titlebar .button.titlebutton:insensitive:checked > GtkLabel, + GtkCalendar.header .button.titlebutton:insensitive:checked > GtkLabel { color: inherit; } .button.osd { color: #eeeeec; @@ -353,7 +367,9 @@ GtkTextView { icon-shadow: 0 1px black; border-color: rgba(255, 255, 255, 0.1); box-shadow: none; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton, + GtkCalendar.header .button.osd.titlebutton { padding: 13px; } .button.osd:hover { color: white; @@ -605,12 +621,20 @@ GtkTextView { box-shadow: none; text-shadow: none; icon-shadow: none; } - .button.image-button, .button.image-button { + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton, + GtkCalendar.header .button.titlebutton, .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton, + GtkCalendar.header .button.titlebutton { padding: 8px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .action-bar .stack-switcher .button.image-button, .header-bar .stack-switcher .button.image-button { + .action-bar .stack-switcher .button.image-button, .action-bar .stack-switcher .header-bar .button.titlebutton, .header-bar .action-bar .stack-switcher .button.titlebutton, + .action-bar .stack-switcher .titlebar .button.titlebutton, + .titlebar .action-bar .stack-switcher .button.titlebutton, + .action-bar .stack-switcher GtkCalendar.header .button.titlebutton, + GtkCalendar.header .action-bar .stack-switcher .button.titlebutton, .header-bar .stack-switcher .button.image-button, .header-bar .stack-switcher .button.titlebutton { padding: 5px 2px; } .action-bar .stack-switcher .button.text-button, .header-bar .stack-switcher .button.text-button { padding-left: 10px; @@ -741,48 +765,116 @@ GtkTextView { .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { color: inherit; } -.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, +.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat, .inline-toolbar GtkToolButton:backdrop > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { +.inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { border-radius: 0; border-left-style: none; } - .inline-toolbar GtkToolButton > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, + .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl), + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:dir(rtl), + .titlebar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl), + .inline-toolbar GtkCalendar.header GtkToolButton > .button.titlebutton:dir(rtl), + GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl), + .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, - .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { + .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, + .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { border-radius: 0; border-right-style: none; border-left-style: solid; } -.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, +.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:first-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:first-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { +.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop:first-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, +.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:last-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:last-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { +.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop:last-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { border-radius: 0 3px 3px 0; } - .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, + .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .inline-toolbar GtkCalendar.header GtkToolButton:last-child > .button.titlebutton:dir(rtl), + GtkCalendar.header .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, - .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { + .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, + .inline-toolbar .header-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .header-bar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { border-right-style: solid; } -.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, +.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:only-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:only-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button { +.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop:only-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button { border-radius: 3px; border-style: solid; } @@ -798,7 +890,21 @@ GtkTextView { border-radius: 3px; border-style: solid; } -.button.flat, .button.flat:backdrop, .button.flat:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, .app-notification.frame .button.flat, .app-notification.frame .button.flat:backdrop, .app-notification.frame .button.flat:insensitive, .app-notification.frame .button.flat:backdrop:insensitive, GtkCalendar.button, GtkCalendar.button:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { +.button.flat, .header-bar .button.titlebutton, +.titlebar .button.titlebutton, +GtkCalendar.header .button.titlebutton, .button.flat:backdrop, .button.flat:backdrop:insensitive, .header-bar .button.titlebutton:backdrop:insensitive, +.titlebar .button.titlebutton:backdrop:insensitive, +GtkCalendar.header .button.titlebutton:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .header-bar .menuitem.button.titlebutton:backdrop, +.titlebar .menuitem.button.titlebutton:backdrop, +GtkCalendar.header .menuitem.button.titlebutton:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, .app-notification.frame .button.flat, .app-notification.frame .header-bar .button.titlebutton, .header-bar .app-notification.frame .button.titlebutton, +.app-notification.frame .titlebar .button.titlebutton, +.titlebar .app-notification.frame .button.titlebutton, +.app-notification.frame GtkCalendar.header .button.titlebutton, +GtkCalendar.header .app-notification.frame .button.titlebutton, .app-notification.frame .button.flat:backdrop, .app-notification.frame .button.flat:insensitive, .app-notification.frame .button.flat:backdrop:insensitive, .app-notification.frame .header-bar .button.titlebutton:backdrop:insensitive, .header-bar .app-notification.frame .button.titlebutton:backdrop:insensitive, +.app-notification.frame .titlebar .button.titlebutton:backdrop:insensitive, +.titlebar .app-notification.frame .button.titlebutton:backdrop:insensitive, +.app-notification.frame GtkCalendar.header .button.titlebutton:backdrop:insensitive, +GtkCalendar.header .app-notification.frame .button.titlebutton:backdrop:insensitive, GtkCalendar.button, GtkCalendar.button:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { border-color: transparent; background-color: transparent; background-image: none; @@ -807,9 +913,13 @@ GtkTextView { icon-shadow: none; } /* menu buttons */ -.menuitem.button.flat { +.menuitem.button.flat, .header-bar .menuitem.button.titlebutton, +.titlebar .menuitem.button.titlebutton, +GtkCalendar.header .menuitem.button.titlebutton { outline-offset: -1px; } - .menuitem.button.flat:hover { + .menuitem.button.flat:hover, .header-bar .menuitem.button.titlebutton:hover, + .titlebar .menuitem.button.titlebutton:hover, + GtkCalendar.header .menuitem.button.titlebutton:hover { background-color: #4b5050; } GtkColorButton.button { @@ -1085,7 +1195,7 @@ GtkComboBox { .titlebar.selection-mode, GtkCalendar.selection-mode.header, .header-bar.selection-mode { color: #ffffff; - text-shadow: 0 1px rgba(0, 0, 0, 0.5); + text-shadow: 0 -1px rgba(0, 0, 0, 0.5); border-color: #0f2b48; background-image: linear-gradient(to bottom, #256ab1, #215d9c); box-shadow: inset 0 -1px #1a4b7e, inset 0 1px rgba(48, 103, 161, 0.46); } @@ -1415,8 +1525,18 @@ GtkTreeView.view.progressbar { .popover.osd > .location-bar { border-style: none; background-color: transparent; } - .popover .button.flat, - .popover .button.flat:hover { + .popover .button.flat, .popover .header-bar .button.titlebutton, .header-bar .popover .button.titlebutton, + .popover .titlebar .button.titlebutton, + .titlebar .popover .button.titlebutton, + .popover GtkCalendar.header .button.titlebutton, + GtkCalendar.header .popover .button.titlebutton, + .popover .button.flat:hover, + .popover .header-bar .button.titlebutton:hover, + .header-bar .popover .button.titlebutton:hover, + .popover .titlebar .button.titlebutton:hover, + .titlebar .popover .button.titlebutton:hover, + .popover GtkCalendar.header .button.titlebutton:hover, + GtkCalendar.header .popover .button.titlebutton:hover { text-shadow: none; transition: none; } .popover.osd { @@ -1860,109 +1980,145 @@ GtkSwitch { .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check.button.flat { + .check.button.flat, .header-bar .check.button.titlebutton, + .titlebar .check.button.titlebutton, + GtkCalendar.header .check.button.titlebutton { icon-shadow: none; } .check:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:hover.button.flat { + .check:hover.button.flat, .header-bar .check.button.titlebutton:hover, + .titlebar .check.button.titlebutton:hover, + GtkCalendar.header .check.button.titlebutton:hover { icon-shadow: none; } .check:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:active.button.flat { + .check:active.button.flat, .header-bar .check.button.titlebutton:active, + .titlebar .check.button.titlebutton:active, + GtkCalendar.header .check.button.titlebutton:active { icon-shadow: none; } .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:insensitive.button.flat { + .check:insensitive.button.flat, .header-bar .check.button.titlebutton:insensitive, + .titlebar .check.button.titlebutton:insensitive, + GtkCalendar.header .check.button.titlebutton:insensitive { icon-shadow: none; } .check:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png")); icon-shadow: none; } - .check:backdrop.button.flat { + .check:backdrop.button.flat, .header-bar .check.button.titlebutton:backdrop, + .titlebar .check.button.titlebutton:backdrop, + GtkCalendar.header .check.button.titlebutton:backdrop { icon-shadow: none; } .check:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } - .check:backdrop:insensitive.button.flat { + .check:backdrop:insensitive.button.flat, .header-bar .check.button.titlebutton:backdrop:insensitive, + .titlebar .check.button.titlebutton:backdrop:insensitive, + GtkCalendar.header .check.button.titlebutton:backdrop:insensitive { icon-shadow: none; } .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:inconsistent.button.flat { + .check:inconsistent.button.flat, .header-bar .check.button.titlebutton:inconsistent, + .titlebar .check.button.titlebutton:inconsistent, + GtkCalendar.header .check.button.titlebutton:inconsistent { icon-shadow: none; } .check:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:inconsistent:hover.button.flat { + .check:inconsistent:hover.button.flat, .header-bar .check.button.titlebutton:inconsistent:hover, + .titlebar .check.button.titlebutton:inconsistent:hover, + GtkCalendar.header .check.button.titlebutton:inconsistent:hover { icon-shadow: none; } .check:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:inconsistent:selected.button.flat { + .check:inconsistent:selected.button.flat, .header-bar .check.button.titlebutton:inconsistent:selected, + .titlebar .check.button.titlebutton:inconsistent:selected, + GtkCalendar.header .check.button.titlebutton:inconsistent:selected { icon-shadow: none; } .check:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png")); icon-shadow: none; } - .check:inconsistent:backdrop.button.flat { + .check:inconsistent:backdrop.button.flat, .header-bar .check.button.titlebutton:inconsistent:backdrop, + .titlebar .check.button.titlebutton:inconsistent:backdrop, + GtkCalendar.header .check.button.titlebutton:inconsistent:backdrop { icon-shadow: none; } .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:inconsistent:insensitive.button.flat { + .check:inconsistent:insensitive.button.flat, .header-bar .check.button.titlebutton:inconsistent:insensitive, + .titlebar .check.button.titlebutton:inconsistent:insensitive, + GtkCalendar.header .check.button.titlebutton:inconsistent:insensitive { icon-shadow: none; } .check:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png")); icon-shadow: none; } - .check:inconsistent:insensitive:backdrop.button.flat { + .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.button.titlebutton:inconsistent:insensitive:backdrop, + .titlebar .check.button.titlebutton:inconsistent:insensitive:backdrop, + GtkCalendar.header .check.button.titlebutton:inconsistent:insensitive:backdrop { icon-shadow: none; } .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:checked.button.flat { + .check:checked.button.flat, .header-bar .check.button.titlebutton:checked, + .titlebar .check.button.titlebutton:checked, + GtkCalendar.header .check.button.titlebutton:checked { icon-shadow: none; } .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:checked:insensitive.button.flat { + .check:checked:insensitive.button.flat, .header-bar .check.button.titlebutton:checked:insensitive, + .titlebar .check.button.titlebutton:checked:insensitive, + GtkCalendar.header .check.button.titlebutton:checked:insensitive { icon-shadow: none; } .check:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:checked:hover.button.flat { + .check:checked:hover.button.flat, .header-bar .check.button.titlebutton:checked:hover, + .titlebar .check.button.titlebutton:checked:hover, + GtkCalendar.header .check.button.titlebutton:checked:hover { icon-shadow: none; } .check:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .check:checked:active.button.flat { + .check:checked:active.button.flat, .header-bar .check.button.titlebutton:checked:active, + .titlebar .check.button.titlebutton:checked:active, + GtkCalendar.header .check.button.titlebutton:checked:active { icon-shadow: none; } .check:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png")); icon-shadow: none; } - .check:backdrop:checked.button.flat { + .check:backdrop:checked.button.flat, .header-bar .check.button.titlebutton:backdrop:checked, + .titlebar .check.button.titlebutton:backdrop:checked, + GtkCalendar.header .check.button.titlebutton:backdrop:checked { icon-shadow: none; } .check:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } - .check:backdrop:checked:insensitive.button.flat { + .check:backdrop:checked:insensitive.button.flat, .header-bar .check.button.titlebutton:backdrop:checked:insensitive, + .titlebar .check.button.titlebutton:backdrop:checked:insensitive, + GtkCalendar.header .check.button.titlebutton:backdrop:checked:insensitive { icon-shadow: none; } .menu .menuitem.check { @@ -1981,109 +2137,145 @@ GtkSwitch { .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio.button.flat { + .radio.button.flat, .header-bar .radio.button.titlebutton, + .titlebar .radio.button.titlebutton, + GtkCalendar.header .radio.button.titlebutton { icon-shadow: none; } .radio:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:hover.button.flat { + .radio:hover.button.flat, .header-bar .radio.button.titlebutton:hover, + .titlebar .radio.button.titlebutton:hover, + GtkCalendar.header .radio.button.titlebutton:hover { icon-shadow: none; } .radio:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:active.button.flat { + .radio:active.button.flat, .header-bar .radio.button.titlebutton:active, + .titlebar .radio.button.titlebutton:active, + GtkCalendar.header .radio.button.titlebutton:active { icon-shadow: none; } .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:insensitive.button.flat { + .radio:insensitive.button.flat, .header-bar .radio.button.titlebutton:insensitive, + .titlebar .radio.button.titlebutton:insensitive, + GtkCalendar.header .radio.button.titlebutton:insensitive { icon-shadow: none; } .radio:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png")); icon-shadow: none; } - .radio:backdrop.button.flat { + .radio:backdrop.button.flat, .header-bar .radio.button.titlebutton:backdrop, + .titlebar .radio.button.titlebutton:backdrop, + GtkCalendar.header .radio.button.titlebutton:backdrop { icon-shadow: none; } .radio:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } - .radio:backdrop:insensitive.button.flat { + .radio:backdrop:insensitive.button.flat, .header-bar .radio.button.titlebutton:backdrop:insensitive, + .titlebar .radio.button.titlebutton:backdrop:insensitive, + GtkCalendar.header .radio.button.titlebutton:backdrop:insensitive { icon-shadow: none; } .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:inconsistent.button.flat { + .radio:inconsistent.button.flat, .header-bar .radio.button.titlebutton:inconsistent, + .titlebar .radio.button.titlebutton:inconsistent, + GtkCalendar.header .radio.button.titlebutton:inconsistent { icon-shadow: none; } .radio:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:inconsistent:hover.button.flat { + .radio:inconsistent:hover.button.flat, .header-bar .radio.button.titlebutton:inconsistent:hover, + .titlebar .radio.button.titlebutton:inconsistent:hover, + GtkCalendar.header .radio.button.titlebutton:inconsistent:hover { icon-shadow: none; } .radio:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:inconsistent:selected.button.flat { + .radio:inconsistent:selected.button.flat, .header-bar .radio.button.titlebutton:inconsistent:selected, + .titlebar .radio.button.titlebutton:inconsistent:selected, + GtkCalendar.header .radio.button.titlebutton:inconsistent:selected { icon-shadow: none; } .radio:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png")); icon-shadow: none; } - .radio:inconsistent:backdrop.button.flat { + .radio:inconsistent:backdrop.button.flat, .header-bar .radio.button.titlebutton:inconsistent:backdrop, + .titlebar .radio.button.titlebutton:inconsistent:backdrop, + GtkCalendar.header .radio.button.titlebutton:inconsistent:backdrop { icon-shadow: none; } .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:inconsistent:insensitive.button.flat { + .radio:inconsistent:insensitive.button.flat, .header-bar .radio.button.titlebutton:inconsistent:insensitive, + .titlebar .radio.button.titlebutton:inconsistent:insensitive, + GtkCalendar.header .radio.button.titlebutton:inconsistent:insensitive { icon-shadow: none; } .radio:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png")); icon-shadow: none; } - .radio:inconsistent:insensitive:backdrop.button.flat { + .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.button.titlebutton:inconsistent:insensitive:backdrop, + .titlebar .radio.button.titlebutton:inconsistent:insensitive:backdrop, + GtkCalendar.header .radio.button.titlebutton:inconsistent:insensitive:backdrop { icon-shadow: none; } .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:checked.button.flat { + .radio:checked.button.flat, .header-bar .radio.button.titlebutton:checked, + .titlebar .radio.button.titlebutton:checked, + GtkCalendar.header .radio.button.titlebutton:checked { icon-shadow: none; } .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:checked:insensitive.button.flat { + .radio:checked:insensitive.button.flat, .header-bar .radio.button.titlebutton:checked:insensitive, + .titlebar .radio.button.titlebutton:checked:insensitive, + GtkCalendar.header .radio.button.titlebutton:checked:insensitive { icon-shadow: none; } .radio:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:checked:hover.button.flat { + .radio:checked:hover.button.flat, .header-bar .radio.button.titlebutton:checked:hover, + .titlebar .radio.button.titlebutton:checked:hover, + GtkCalendar.header .radio.button.titlebutton:checked:hover { icon-shadow: none; } .radio:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png")); icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); } - .radio:checked:active.button.flat { + .radio:checked:active.button.flat, .header-bar .radio.button.titlebutton:checked:active, + .titlebar .radio.button.titlebutton:checked:active, + GtkCalendar.header .radio.button.titlebutton:checked:active { icon-shadow: none; } .radio:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png")); icon-shadow: none; } - .radio:backdrop:checked.button.flat { + .radio:backdrop:checked.button.flat, .header-bar .radio.button.titlebutton:backdrop:checked, + .titlebar .radio.button.titlebutton:backdrop:checked, + GtkCalendar.header .radio.button.titlebutton:backdrop:checked { icon-shadow: none; } .radio:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png")); icon-shadow: none; } - .radio:backdrop:checked:insensitive.button.flat { + .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.button.titlebutton:backdrop:checked:insensitive, + .titlebar .radio.button.titlebutton:backdrop:checked:insensitive, + GtkCalendar.header .radio.button.titlebutton:backdrop:checked:insensitive { icon-shadow: none; } .menu .menuitem.radio { @@ -2690,10 +2882,14 @@ GtkLevelBar.vertical { .level-bar.fill-block.empty-fill-block:backdrop { border-color: rgba(201, 203, 201, 0.15); } -.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.button.titlebutton:selected, +.titlebar .menuitem.button.titlebutton:selected, +GtkCalendar.header .menuitem.button.titlebutton:selected { background-color: #215d9c; color: #ffffff; } - .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { + .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.button.titlebutton:backdrop:selected, + .titlebar .menuitem.button.titlebutton:backdrop:selected, + GtkCalendar.header .menuitem.button.titlebutton:backdrop:selected { color: #c9cbc9; } /********** @@ -2792,7 +2988,11 @@ GtkScrolledWindow GtkViewport.frame { box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; icon-shadow: 0 1px black; } - .app-notification.frame .button.flat { + .app-notification.frame .button.flat, .app-notification.frame .header-bar .button.titlebutton, .header-bar .app-notification.frame .button.titlebutton, + .app-notification.frame .titlebar .button.titlebutton, + .titlebar .app-notification.frame .button.titlebutton, + .app-notification.frame GtkCalendar.header .button.titlebutton, + GtkCalendar.header .app-notification.frame .button.titlebutton { icon-shadow: 0 1px black; text-shadow: 0 1px black; } .app-notification.frame .button:hover { @@ -3271,44 +3471,6 @@ GtkVolumeButton.button { border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); } -.header-bar .button.titlebutton, -.titlebar .button.titlebutton, -GtkCalendar.header .button.titlebutton { - padding: 8px; - border-color: transparent; - background-image: none; - transition-property: border, box-shadow, color; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .header-bar .button.titlebutton:hover, - .titlebar .button.titlebutton:hover, - GtkCalendar.header .button.titlebutton:hover { - color: #eeeeec; - background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232); - border-color: #1c1f1f; - text-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } - .header-bar .button.titlebutton:active, - .titlebar .button.titlebutton:active, - GtkCalendar.header .button.titlebutton:active { - color: #eeeeec; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #232727, #2d3232); - text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } - .header-bar .button.titlebutton:backdrop, - .titlebar .button.titlebutton:backdrop, - GtkCalendar.header .button.titlebutton:backdrop { - color: #c9cbc9; - border-color: #1e2222; - background-image: linear-gradient(to bottom, #393f3f); - text-shadow: none; - icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); - border-color: transparent; - transition-property: border, box-shadow, color; } - /* GTK NAMED COLORS */ @define-color theme_fg_color #eeeeec; @define-color theme_bg_color #393f3f; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 03c12c2fa8..927564aace 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -269,7 +269,9 @@ GtkTextView { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white, 0 1px white; } - .button:hover, .button.flat:hover { + .button:hover, .button.flat:hover, .header-bar .button.titlebutton:hover, + .titlebar .button.titlebutton:hover, + GtkCalendar.header .button.titlebutton:hover { color: #2e3436; border-color: #a1a1a1; background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed); @@ -277,7 +279,11 @@ GtkTextView { icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white, 0 1px white; -gtk-image-effect: highlight; } - .button:active, .button.flat:active, .button:checked, .button.flat:checked { + .button:active, .button.flat:active, .header-bar .button.titlebutton:active, + .titlebar .button.titlebutton:active, + GtkCalendar.header .button.titlebutton:active, .button:checked, .button.flat:checked, .header-bar .button.titlebutton:checked, + .titlebar .button.titlebutton:checked, + GtkCalendar.header .button.titlebutton:checked { color: #2e3436; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); @@ -323,14 +329,22 @@ GtkTextView { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } .button:insensitive > GtkLabel { color: inherit; } - .button:insensitive:active, .button:insensitive.flat:active, .button:insensitive:checked, .button:insensitive.flat:checked { + .button:insensitive:active, .button:insensitive.flat:active, .header-bar .button.titlebutton:insensitive:active, + .titlebar .button.titlebutton:insensitive:active, + GtkCalendar.header .button.titlebutton:insensitive:active, .button:insensitive:checked, .button:insensitive.flat:checked, .header-bar .button.titlebutton:insensitive:checked, + .titlebar .button.titlebutton:insensitive:checked, + GtkCalendar.header .button.titlebutton:insensitive:checked { color: #8d9091; border-color: #a1a1a1; color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .button:insensitive:active > GtkLabel, .button:insensitive.flat:active > GtkLabel, .button:insensitive:checked > GtkLabel, .button:insensitive.flat:checked > GtkLabel { + .button:insensitive:active > GtkLabel, .button:insensitive.flat:active > GtkLabel, .header-bar .button.titlebutton:insensitive:active > GtkLabel, + .titlebar .button.titlebutton:insensitive:active > GtkLabel, + GtkCalendar.header .button.titlebutton:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel, .button:insensitive.flat:checked > GtkLabel, .header-bar .button.titlebutton:insensitive:checked > GtkLabel, + .titlebar .button.titlebutton:insensitive:checked > GtkLabel, + GtkCalendar.header .button.titlebutton:insensitive:checked > GtkLabel { color: inherit; } .button.osd { color: #eeeeec; @@ -345,7 +359,9 @@ GtkTextView { icon-shadow: 0 1px black; border-color: rgba(255, 255, 255, 0.1); box-shadow: none; } - .button.osd.image-button { + .button.osd.image-button, .header-bar .button.osd.titlebutton, + .titlebar .button.osd.titlebutton, + GtkCalendar.header .button.osd.titlebutton { padding: 13px; } .button.osd:hover { color: white; @@ -597,12 +613,20 @@ GtkTextView { box-shadow: none; text-shadow: none; icon-shadow: none; } - .button.image-button, .button.image-button { + .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton, + GtkCalendar.header .button.titlebutton, .button.image-button, .header-bar .button.titlebutton, + .titlebar .button.titlebutton, + GtkCalendar.header .button.titlebutton { padding: 8px; } .button.text-button { padding-left: 16px; padding-right: 16px; } - .action-bar .stack-switcher .button.image-button, .header-bar .stack-switcher .button.image-button { + .action-bar .stack-switcher .button.image-button, .action-bar .stack-switcher .header-bar .button.titlebutton, .header-bar .action-bar .stack-switcher .button.titlebutton, + .action-bar .stack-switcher .titlebar .button.titlebutton, + .titlebar .action-bar .stack-switcher .button.titlebutton, + .action-bar .stack-switcher GtkCalendar.header .button.titlebutton, + GtkCalendar.header .action-bar .stack-switcher .button.titlebutton, .header-bar .stack-switcher .button.image-button, .header-bar .stack-switcher .button.titlebutton { padding: 5px 2px; } .action-bar .stack-switcher .button.text-button, .header-bar .stack-switcher .button.text-button { padding-left: 10px; @@ -733,48 +757,116 @@ GtkTextView { .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { color: inherit; } -.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, +.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop > .button.flat, .inline-toolbar GtkToolButton:backdrop > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { +.inline-toolbar.location-bar GtkToolButton:backdrop > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, .osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd .button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { border-radius: 0; border-left-style: none; } - .inline-toolbar GtkToolButton > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, + .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl), + .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:dir(rtl), + .titlebar .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl), + .inline-toolbar GtkCalendar.header GtkToolButton > .button.titlebutton:dir(rtl), + GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton:dir(rtl), + .inline-toolbar GtkToolButton:backdrop > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:dir(rtl) > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, - .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { + .inline-toolbar.location-bar GtkToolButton:backdrop:dir(rtl) > .button.flat, + .inline-toolbar .header-bar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .header-bar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:dir(rtl) > .button.titlebutton, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .osd .button:dir(rtl):backdrop, .osd .button.suggested-action:dir(rtl), .osd .button.destructive-action:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { border-radius: 0; border-right-style: none; border-left-style: solid; } -.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, +.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .osd .button:first-child:backdrop, .osd .button.suggested-action:first-child, .osd .button.destructive-action:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:first-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:first-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:first-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:first-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:first-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:first-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:first-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:first-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:first-child > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { +.inline-toolbar.location-bar GtkToolButton:backdrop:first-child > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop:first-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child, .linked > GtkComboBox:first-child > .button { border-radius: 3px 0 0 3px; border-left-style: solid; } -.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, +.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd .button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:last-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:last-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { +.inline-toolbar.location-bar GtkToolButton:backdrop:last-child > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop:last-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child, .linked > GtkComboBox:last-child > .button { border-radius: 0 3px 3px 0; } - .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), - .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, + .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .osd .button:last-child:dir(rtl):backdrop, .osd .button.suggested-action:last-child:dir(rtl), .osd .button.destructive-action:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar .header-bar GtkToolButton:last-child > .button.titlebutton:dir(rtl), .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .inline-toolbar .titlebar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .titlebar .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .inline-toolbar GtkCalendar.header GtkToolButton:last-child > .button.titlebutton:dir(rtl), + GtkCalendar.header .inline-toolbar GtkToolButton:last-child > .button.titlebutton:dir(rtl), + .inline-toolbar GtkToolButton:backdrop:last-child > .button.flat:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar .header-bar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:last-child:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, - .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { + .inline-toolbar.location-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.flat, + .inline-toolbar .header-bar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .header-bar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar .titlebar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .titlebar .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + .inline-toolbar GtkCalendar.header GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, + GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:last-child:dir(rtl) > .button.titlebutton, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { border-right-style: solid; } -.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, +.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .osd .button:only-child:backdrop, .osd .button.suggested-action:only-child, .osd .button.destructive-action:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:only-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:only-child > .button.flat, .inline-toolbar .header-bar GtkToolButton:only-child > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:only-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:only-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:only-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:only-child > .button.titlebutton, .inline-toolbar.toolbar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar GtkToolButton:backdrop:only-child > .button.flat, .inline-toolbar.search-bar GtkToolButton:backdrop:only-child > .button.flat, -.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button { +.inline-toolbar.location-bar GtkToolButton:backdrop:only-child > .button.flat, +.inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton, +.header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, +.inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton, +.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, +.inline-toolbar GtkCalendar.header GtkToolButton:backdrop:only-child > .button.titlebutton, +GtkCalendar.header .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .button:only-child, .linked > GtkComboBox:only-child > .button { border-radius: 3px; border-style: solid; } @@ -790,7 +882,21 @@ GtkTextView { border-radius: 3px; border-style: solid; } -.button.flat, .button.flat:backdrop, .button.flat:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, .app-notification.frame .button.flat, .app-notification.frame .button.flat:backdrop, .app-notification.frame .button.flat:insensitive, .app-notification.frame .button.flat:backdrop:insensitive, GtkCalendar.button, GtkCalendar.button:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { +.button.flat, .header-bar .button.titlebutton, +.titlebar .button.titlebutton, +GtkCalendar.header .button.titlebutton, .button.flat:backdrop, .button.flat:backdrop:insensitive, .header-bar .button.titlebutton:backdrop:insensitive, +.titlebar .button.titlebutton:backdrop:insensitive, +GtkCalendar.header .button.titlebutton:backdrop:insensitive, .menuitem.button.flat, .menuitem.button.flat:backdrop, .header-bar .menuitem.button.titlebutton:backdrop, +.titlebar .menuitem.button.titlebutton:backdrop, +GtkCalendar.header .menuitem.button.titlebutton:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, .list-row.button, .list-row.button:backdrop:hover, .app-notification.frame .button.flat, .app-notification.frame .header-bar .button.titlebutton, .header-bar .app-notification.frame .button.titlebutton, +.app-notification.frame .titlebar .button.titlebutton, +.titlebar .app-notification.frame .button.titlebutton, +.app-notification.frame GtkCalendar.header .button.titlebutton, +GtkCalendar.header .app-notification.frame .button.titlebutton, .app-notification.frame .button.flat:backdrop, .app-notification.frame .button.flat:insensitive, .app-notification.frame .button.flat:backdrop:insensitive, .app-notification.frame .header-bar .button.titlebutton:backdrop:insensitive, .header-bar .app-notification.frame .button.titlebutton:backdrop:insensitive, +.app-notification.frame .titlebar .button.titlebutton:backdrop:insensitive, +.titlebar .app-notification.frame .button.titlebutton:backdrop:insensitive, +.app-notification.frame GtkCalendar.header .button.titlebutton:backdrop:insensitive, +GtkCalendar.header .app-notification.frame .button.titlebutton:backdrop:insensitive, GtkCalendar.button, GtkCalendar.button:hover, .scale-popup .button:hover, .scale-popup .button:backdrop, .scale-popup .button:backdrop:hover, .scale-popup .button:backdrop:insensitive { border-color: transparent; background-color: transparent; background-image: none; @@ -799,9 +905,13 @@ GtkTextView { icon-shadow: none; } /* menu buttons */ -.menuitem.button.flat { +.menuitem.button.flat, .header-bar .menuitem.button.titlebutton, +.titlebar .menuitem.button.titlebutton, +GtkCalendar.header .menuitem.button.titlebutton { outline-offset: -1px; } - .menuitem.button.flat:hover { + .menuitem.button.flat:hover, .header-bar .menuitem.button.titlebutton:hover, + .titlebar .menuitem.button.titlebutton:hover, + GtkCalendar.header .menuitem.button.titlebutton:hover { background-color: #d9dada; } GtkColorButton.button { @@ -1077,7 +1187,7 @@ GtkComboBox { .titlebar.selection-mode, GtkCalendar.selection-mode.header, .header-bar.selection-mode { color: #ffffff; - text-shadow: 0 1px rgba(0, 0, 0, 0.5); + text-shadow: 0 -1px rgba(0, 0, 0, 0.5); border-color: #184472; background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9); box-shadow: inset 0 -1px #3875b4, inset 0 1px #b6d2ef; } @@ -1409,8 +1519,18 @@ GtkTreeView.view.progressbar { .popover.osd > .location-bar { border-style: none; background-color: transparent; } - .popover .button.flat, - .popover .button.flat:hover { + .popover .button.flat, .popover .header-bar .button.titlebutton, .header-bar .popover .button.titlebutton, + .popover .titlebar .button.titlebutton, + .titlebar .popover .button.titlebutton, + .popover GtkCalendar.header .button.titlebutton, + GtkCalendar.header .popover .button.titlebutton, + .popover .button.flat:hover, + .popover .header-bar .button.titlebutton:hover, + .header-bar .popover .button.titlebutton:hover, + .popover .titlebar .button.titlebutton:hover, + .titlebar .popover .button.titlebutton:hover, + .popover GtkCalendar.header .button.titlebutton:hover, + GtkCalendar.header .popover .button.titlebutton:hover { text-shadow: none; transition: none; } .popover.osd { @@ -1855,109 +1975,145 @@ GtkSwitch { .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); icon-shadow: 0 1px 0 white; } - .check.button.flat { + .check.button.flat, .header-bar .check.button.titlebutton, + .titlebar .check.button.titlebutton, + GtkCalendar.header .check.button.titlebutton { icon-shadow: none; } .check:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png")); icon-shadow: 0 1px 0 white; } - .check:hover.button.flat { + .check:hover.button.flat, .header-bar .check.button.titlebutton:hover, + .titlebar .check.button.titlebutton:hover, + GtkCalendar.header .check.button.titlebutton:hover { icon-shadow: none; } .check:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png")); icon-shadow: 0 1px 0 white; } - .check:active.button.flat { + .check:active.button.flat, .header-bar .check.button.titlebutton:active, + .titlebar .check.button.titlebutton:active, + GtkCalendar.header .check.button.titlebutton:active { icon-shadow: none; } .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } - .check:insensitive.button.flat { + .check:insensitive.button.flat, .header-bar .check.button.titlebutton:insensitive, + .titlebar .check.button.titlebutton:insensitive, + GtkCalendar.header .check.button.titlebutton:insensitive { icon-shadow: none; } .check:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png")); icon-shadow: none; } - .check:backdrop.button.flat { + .check:backdrop.button.flat, .header-bar .check.button.titlebutton:backdrop, + .titlebar .check.button.titlebutton:backdrop, + GtkCalendar.header .check.button.titlebutton:backdrop { icon-shadow: none; } .check:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png")); icon-shadow: none; } - .check:backdrop:insensitive.button.flat { + .check:backdrop:insensitive.button.flat, .header-bar .check.button.titlebutton:backdrop:insensitive, + .titlebar .check.button.titlebutton:backdrop:insensitive, + GtkCalendar.header .check.button.titlebutton:backdrop:insensitive { icon-shadow: none; } .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); icon-shadow: 0 1px 0 white; } - .check:inconsistent.button.flat { + .check:inconsistent.button.flat, .header-bar .check.button.titlebutton:inconsistent, + .titlebar .check.button.titlebutton:inconsistent, + GtkCalendar.header .check.button.titlebutton:inconsistent { icon-shadow: none; } .check:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png")); icon-shadow: 0 1px 0 white; } - .check:inconsistent:hover.button.flat { + .check:inconsistent:hover.button.flat, .header-bar .check.button.titlebutton:inconsistent:hover, + .titlebar .check.button.titlebutton:inconsistent:hover, + GtkCalendar.header .check.button.titlebutton:inconsistent:hover { icon-shadow: none; } .check:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png")); icon-shadow: 0 1px 0 white; } - .check:inconsistent:selected.button.flat { + .check:inconsistent:selected.button.flat, .header-bar .check.button.titlebutton:inconsistent:selected, + .titlebar .check.button.titlebutton:inconsistent:selected, + GtkCalendar.header .check.button.titlebutton:inconsistent:selected { icon-shadow: none; } .check:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png")); icon-shadow: none; } - .check:inconsistent:backdrop.button.flat { + .check:inconsistent:backdrop.button.flat, .header-bar .check.button.titlebutton:inconsistent:backdrop, + .titlebar .check.button.titlebutton:inconsistent:backdrop, + GtkCalendar.header .check.button.titlebutton:inconsistent:backdrop { icon-shadow: none; } .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); icon-shadow: 0 1px 0 white; } - .check:inconsistent:insensitive.button.flat { + .check:inconsistent:insensitive.button.flat, .header-bar .check.button.titlebutton:inconsistent:insensitive, + .titlebar .check.button.titlebutton:inconsistent:insensitive, + GtkCalendar.header .check.button.titlebutton:inconsistent:insensitive { icon-shadow: none; } .check:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png")); icon-shadow: none; } - .check:inconsistent:insensitive:backdrop.button.flat { + .check:inconsistent:insensitive:backdrop.button.flat, .header-bar .check.button.titlebutton:inconsistent:insensitive:backdrop, + .titlebar .check.button.titlebutton:inconsistent:insensitive:backdrop, + GtkCalendar.header .check.button.titlebutton:inconsistent:insensitive:backdrop { icon-shadow: none; } .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); icon-shadow: 0 1px 0 white; } - .check:checked.button.flat { + .check:checked.button.flat, .header-bar .check.button.titlebutton:checked, + .titlebar .check.button.titlebutton:checked, + GtkCalendar.header .check.button.titlebutton:checked { icon-shadow: none; } .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } - .check:checked:insensitive.button.flat { + .check:checked:insensitive.button.flat, .header-bar .check.button.titlebutton:checked:insensitive, + .titlebar .check.button.titlebutton:checked:insensitive, + GtkCalendar.header .check.button.titlebutton:checked:insensitive { icon-shadow: none; } .check:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png")); icon-shadow: 0 1px 0 white; } - .check:checked:hover.button.flat { + .check:checked:hover.button.flat, .header-bar .check.button.titlebutton:checked:hover, + .titlebar .check.button.titlebutton:checked:hover, + GtkCalendar.header .check.button.titlebutton:checked:hover { icon-shadow: none; } .check:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png")); icon-shadow: 0 1px 0 white; } - .check:checked:active.button.flat { + .check:checked:active.button.flat, .header-bar .check.button.titlebutton:checked:active, + .titlebar .check.button.titlebutton:checked:active, + GtkCalendar.header .check.button.titlebutton:checked:active { icon-shadow: none; } .check:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png")); icon-shadow: none; } - .check:backdrop:checked.button.flat { + .check:backdrop:checked.button.flat, .header-bar .check.button.titlebutton:backdrop:checked, + .titlebar .check.button.titlebutton:backdrop:checked, + GtkCalendar.header .check.button.titlebutton:backdrop:checked { icon-shadow: none; } .check:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png")); icon-shadow: none; } - .check:backdrop:checked:insensitive.button.flat { + .check:backdrop:checked:insensitive.button.flat, .header-bar .check.button.titlebutton:backdrop:checked:insensitive, + .titlebar .check.button.titlebutton:backdrop:checked:insensitive, + GtkCalendar.header .check.button.titlebutton:backdrop:checked:insensitive { icon-shadow: none; } .menu .menuitem.check { @@ -1976,109 +2132,145 @@ GtkSwitch { .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); icon-shadow: 0 1px 0 white; } - .radio.button.flat { + .radio.button.flat, .header-bar .radio.button.titlebutton, + .titlebar .radio.button.titlebutton, + GtkCalendar.header .radio.button.titlebutton { icon-shadow: none; } .radio:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png")); icon-shadow: 0 1px 0 white; } - .radio:hover.button.flat { + .radio:hover.button.flat, .header-bar .radio.button.titlebutton:hover, + .titlebar .radio.button.titlebutton:hover, + GtkCalendar.header .radio.button.titlebutton:hover { icon-shadow: none; } .radio:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png")); icon-shadow: 0 1px 0 white; } - .radio:active.button.flat { + .radio:active.button.flat, .header-bar .radio.button.titlebutton:active, + .titlebar .radio.button.titlebutton:active, + GtkCalendar.header .radio.button.titlebutton:active { icon-shadow: none; } .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } - .radio:insensitive.button.flat { + .radio:insensitive.button.flat, .header-bar .radio.button.titlebutton:insensitive, + .titlebar .radio.button.titlebutton:insensitive, + GtkCalendar.header .radio.button.titlebutton:insensitive { icon-shadow: none; } .radio:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png")); icon-shadow: none; } - .radio:backdrop.button.flat { + .radio:backdrop.button.flat, .header-bar .radio.button.titlebutton:backdrop, + .titlebar .radio.button.titlebutton:backdrop, + GtkCalendar.header .radio.button.titlebutton:backdrop { icon-shadow: none; } .radio:backdrop:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png")); icon-shadow: none; } - .radio:backdrop:insensitive.button.flat { + .radio:backdrop:insensitive.button.flat, .header-bar .radio.button.titlebutton:backdrop:insensitive, + .titlebar .radio.button.titlebutton:backdrop:insensitive, + GtkCalendar.header .radio.button.titlebutton:backdrop:insensitive { icon-shadow: none; } .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); icon-shadow: 0 1px 0 white; } - .radio:inconsistent.button.flat { + .radio:inconsistent.button.flat, .header-bar .radio.button.titlebutton:inconsistent, + .titlebar .radio.button.titlebutton:inconsistent, + GtkCalendar.header .radio.button.titlebutton:inconsistent { icon-shadow: none; } .radio:inconsistent:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png")); icon-shadow: 0 1px 0 white; } - .radio:inconsistent:hover.button.flat { + .radio:inconsistent:hover.button.flat, .header-bar .radio.button.titlebutton:inconsistent:hover, + .titlebar .radio.button.titlebutton:inconsistent:hover, + GtkCalendar.header .radio.button.titlebutton:inconsistent:hover { icon-shadow: none; } .radio:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png")); icon-shadow: 0 1px 0 white; } - .radio:inconsistent:selected.button.flat { + .radio:inconsistent:selected.button.flat, .header-bar .radio.button.titlebutton:inconsistent:selected, + .titlebar .radio.button.titlebutton:inconsistent:selected, + GtkCalendar.header .radio.button.titlebutton:inconsistent:selected { icon-shadow: none; } .radio:inconsistent:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png")); icon-shadow: none; } - .radio:inconsistent:backdrop.button.flat { + .radio:inconsistent:backdrop.button.flat, .header-bar .radio.button.titlebutton:inconsistent:backdrop, + .titlebar .radio.button.titlebutton:inconsistent:backdrop, + GtkCalendar.header .radio.button.titlebutton:inconsistent:backdrop { icon-shadow: none; } .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); icon-shadow: 0 1px 0 white; } - .radio:inconsistent:insensitive.button.flat { + .radio:inconsistent:insensitive.button.flat, .header-bar .radio.button.titlebutton:inconsistent:insensitive, + .titlebar .radio.button.titlebutton:inconsistent:insensitive, + GtkCalendar.header .radio.button.titlebutton:inconsistent:insensitive { icon-shadow: none; } .radio:inconsistent:insensitive:backdrop { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png")); icon-shadow: none; } - .radio:inconsistent:insensitive:backdrop.button.flat { + .radio:inconsistent:insensitive:backdrop.button.flat, .header-bar .radio.button.titlebutton:inconsistent:insensitive:backdrop, + .titlebar .radio.button.titlebutton:inconsistent:insensitive:backdrop, + GtkCalendar.header .radio.button.titlebutton:inconsistent:insensitive:backdrop { icon-shadow: none; } .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); icon-shadow: 0 1px 0 white; } - .radio:checked.button.flat { + .radio:checked.button.flat, .header-bar .radio.button.titlebutton:checked, + .titlebar .radio.button.titlebutton:checked, + GtkCalendar.header .radio.button.titlebutton:checked { icon-shadow: none; } .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); icon-shadow: 0 1px 0 white; } - .radio:checked:insensitive.button.flat { + .radio:checked:insensitive.button.flat, .header-bar .radio.button.titlebutton:checked:insensitive, + .titlebar .radio.button.titlebutton:checked:insensitive, + GtkCalendar.header .radio.button.titlebutton:checked:insensitive { icon-shadow: none; } .radio:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png")); icon-shadow: 0 1px 0 white; } - .radio:checked:hover.button.flat { + .radio:checked:hover.button.flat, .header-bar .radio.button.titlebutton:checked:hover, + .titlebar .radio.button.titlebutton:checked:hover, + GtkCalendar.header .radio.button.titlebutton:checked:hover { icon-shadow: none; } .radio:checked:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png")); icon-shadow: 0 1px 0 white; } - .radio:checked:active.button.flat { + .radio:checked:active.button.flat, .header-bar .radio.button.titlebutton:checked:active, + .titlebar .radio.button.titlebutton:checked:active, + GtkCalendar.header .radio.button.titlebutton:checked:active { icon-shadow: none; } .radio:backdrop:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png")); icon-shadow: none; } - .radio:backdrop:checked.button.flat { + .radio:backdrop:checked.button.flat, .header-bar .radio.button.titlebutton:backdrop:checked, + .titlebar .radio.button.titlebutton:backdrop:checked, + GtkCalendar.header .radio.button.titlebutton:backdrop:checked { icon-shadow: none; } .radio:backdrop:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png")); icon-shadow: none; } - .radio:backdrop:checked:insensitive.button.flat { + .radio:backdrop:checked:insensitive.button.flat, .header-bar .radio.button.titlebutton:backdrop:checked:insensitive, + .titlebar .radio.button.titlebutton:backdrop:checked:insensitive, + GtkCalendar.header .radio.button.titlebutton:backdrop:checked:insensitive { icon-shadow: none; } .menu .menuitem.radio { @@ -2685,11 +2877,15 @@ GtkLevelBar.vertical { .level-bar.fill-block.empty-fill-block:backdrop { border-color: rgba(84, 89, 90, 0.15); } -.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.button.titlebutton:selected, +.titlebar .menuitem.button.titlebutton:selected, +GtkCalendar.header .menuitem.button.titlebutton:selected { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } - .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { + .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.button.titlebutton:backdrop:selected, + .titlebar .menuitem.button.titlebutton:backdrop:selected, + GtkCalendar.header .menuitem.button.titlebutton:backdrop:selected { color: #fcfcfc; } /********** @@ -2788,7 +2984,11 @@ GtkScrolledWindow GtkViewport.frame { box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; icon-shadow: 0 1px black; } - .app-notification.frame .button.flat { + .app-notification.frame .button.flat, .app-notification.frame .header-bar .button.titlebutton, .header-bar .app-notification.frame .button.titlebutton, + .app-notification.frame .titlebar .button.titlebutton, + .titlebar .app-notification.frame .button.titlebutton, + .app-notification.frame GtkCalendar.header .button.titlebutton, + GtkCalendar.header .app-notification.frame .button.titlebutton { icon-shadow: 0 1px black; text-shadow: 0 1px black; } .app-notification.frame .button:hover { @@ -3267,44 +3467,6 @@ GtkVolumeButton.button { border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } -.header-bar .button.titlebutton, -.titlebar .button.titlebutton, -GtkCalendar.header .button.titlebutton { - padding: 8px; - border-color: transparent; - background-image: none; - transition-property: border, box-shadow, color; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .header-bar .button.titlebutton:hover, - .titlebar .button.titlebutton:hover, - GtkCalendar.header .button.titlebutton:hover { - color: #2e3436; - background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0); - border-color: #a1a1a1; - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px white, 0 1px white; } - .header-bar .button.titlebutton:active, - .titlebar .button.titlebutton:active, - GtkCalendar.header .button.titlebutton:active { - color: #2e3436; - border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } - .header-bar .button.titlebutton:backdrop, - .titlebar .button.titlebutton:backdrop, - GtkCalendar.header .button.titlebutton:backdrop { - color: #54595a; - border-color: #a8a8a8; - background-image: linear-gradient(to bottom, #ededed); - text-shadow: none; - icon-shadow: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); - border-color: transparent; - transition-property: border, box-shadow, color; } - /* GTK NAMED COLORS */ @define-color theme_fg_color #2e3436; @define-color theme_bg_color #ededed; -- 2.30.2